Still refactoring the msg queue api