Move DynamicHelper to new file