More work on public map