Added some additional features