refactor multitenat v.2