Added a few featyres