Some design changes