Reorganize and add datomic properties.