Preserve options state after usage
Use correct options format