Added bootstrap for manual mapping