added attribute matcher and variable matcher to the new API