Changes the queue apis to return size and count