entities handling + additional events