Added tenant support