Adding stricter comparison logic