A complete rewite of EMS using Collection+JSON