Added attribute filtering