Potential resolution for util.optional