Update to packages moving common functions into utils class