Added more db schema changes
Added DI