some revisions due to scalaxb bug with SimDM