Small design changes