Updated schema to be more EntityFramework-friendly