Design changes

Change-Id: I638f9a8273ddc0bd1bc84b8e616dc36bf37ad287