Added some functionality