Moved some things to util