Made independent from interface implementations

Change-Id: I61fb7fb89aecf27771607196dc83de30787af45b