Better mappings for js