Added Utility methods to their own header files