Improved the performance for lookups by avoiding repeat attribute
checking