Added some useful stuff