Final 0.5.3 commit before restructuring id's