Change domain schema keys
Remove calculate remain account of tenant functions