Added some functionality, methods and other stuff.