DEPRECATED API - THIS AND ALL SUBPACKAGES WILL BE REPLACED