Added mapping over functions that return a validation
Renamed mapping over a function that returns an option