Roughing the report app schema in a bit more