Modified schema and add models