add advanced criteria support