Iss2852 refactor mult resources