Changes to support design/function changes