CB-7133 Changed how resources are being added