Design Changes

Design changes for consistency with other repository