Fixing issue #1 by removing global variable for container