Small design changes
Small design changes