Some customization done. Need to test and expand for all special vars.