ECore models for key areas added. Can maybe be re-arranged to look better.