Added some general purpose things