Few changes to interface plus other stuff