Adding more goodies