Some design changes + Database