Fix initial issues, use Queue API as an example.