Added tenant filter and permission grant classes.