Added additional util functions