Added a couple of attributes queries