added manual mapping