Added module container support