Re-adding container implementation.