Added missing API, constants...