Added tez support