Added some user friendly stuff