Moved utilites as class methods