Changed entity to be able to recive callbacks