Code design changes