Added some more goodies