Added some extra param/return value information