Add initial criteria feature