Added missing constants
Updated uses, exports