Added more goodies