Moved utils classes