Sorry, not convinced. You are stuffing legacy stuff in Entity.php?