Add Option<> back in on consumer