Added some extra features