Code

Fixed schema to fit current requirements