Issue #52 - Switch to pure container references

Switch to pure container references.