Issue #106

Removed hard coded references to storage containers, replacing them with
Hive variable substitution syntax.