Split utility methods into separate files