added helper classes back to the build