Add archive action, (performance) improvements