Schema and some dataapi changes. userapi changes to follow