~ Added module suffix to container class