Adding proper Maybe support.