Develop/0.3 schema