Added resource and domain core options to fix client resource name and user domain.

Cleaning up the branches.