Updated to newest batch event framework including the property name rework