Removed pseudo API, reorganized constants.