Added some more convienience functions