Entity & Model complete