refactored ApiQueue::Parser a bit