Further revision of design of DrawQueue