Added some debug features