Bugfix/issue 52

Switch to pure container references.