Moved where container is setup/declared, fixed container issue