Added some features to main rest runner