Fixing schema again