Added get tenant id from request params. Various changes and more TODOs