Added some design changes