Various improvements together with deuterium-orm