Separated container functionality into a module