More changes! Now handler properly retrieves messages from queue