optimized some mapping
optimized some more mappings