Added some stuff for convenience