adapt to new mapping interface