fixing schema a bit