Design changes from review

Change-Id: I5cf7eb6572ea5556cbefd9206549e61127f5567d