Clearer syntax and forward mapping example