Added implementation for better username matching