Moved common functions into utils class