Adding some goodies