Extracted container management to different module