Made the stack independent from interface implementations

Change-Id: I762402cb27b9e035a46aa295e0619e3166d76bb8