Added automatic value/default support.  Improved security tokens.