Code Design changes