Moved some convenience methods to util.cpp