Util functions moved to seperate class