Minor design changes + config change