Moving to quava Optional