Added first step to multitenancy