Added some additional info to some params