Removed entity handler. Will add a more robust one later on.