Entity callbacks revamped and it works!