Moved some methods to Utility module