Added a cople more features