Modular ARQ with full containers