Added tenant model and handlers