Removed unneccesary interaction types, changed inheritance