Fixed multi-tenancy issue when CDA resources are shared between users

See issue #67 for more information.