Upgraded the set model to have a Elements model