Moved some methods to Util class