Add clear queue + force queue init