Various design changes