Entitys are now properly added.