Fixing schema and adding requirements