Added model entities, still missing most getters and setters