Updated for Interface implementation

Change-Id: I19dfa8398cd021a6d3700fdd1834514564d7c789