Entity awfull management
had to improve this later