Moved function to new Utility class