Added a couple of utilities