Added the improved attribute query
3 files changed