Enterprise Project: refactor-bag fixed