Added queries to the aspect attributes