Refactored the lift to the more fitting flatMap