Added options to limit the number of resources and for handling of resource conflicts