Moved helper methods to a static util class