Added some more nice stuff