server: improved stub for mapping