Remake DB model. Additional properties for User