Experimenting with a better way of mapping operations