updated to dust 2.2.3 & separate dust-helpers