- Separated public APIs into two per, because of new optional Map