switch from deprecated module
relax instance resolution for conditions
update benchmark