Entity Model generated and modified as TOLD BY THEO