Refactor and dependency inject containerData deps