3.0.0-0: Move functions into utility class.