more api and mappings