[WIP] Schema additions and model/data API for Apps

WIP