Added dimension criteria support