Move var declaration.
Add NPG-specific mapper.