Removed resource and domain fields