Cleaned up the configuration for Queue