Added key queue + type of listener