Group updated to be parse-friendly