Add some utility routines