Added a few extra features