Move class methods into a utility module and extend