Added some more functionallity