Move method to Util Class