Added some functionality for class use