Added default tenant field