added non recursive mappings