Alternate implementation for variable containers, bug fixes