Changed entity interactions - Fixes #178