Removed use of Optional to reduce number of created objects during comparison