1. Added checking to prevent queue oversize 2. Added two new partitioner