Add mappings for public API