Adding variable-type dictionaries
Added factor transformation facilities