Moved some standard functionality to the utilities package