Track 'add_option' as well instead of only 'update_option'

WIP, fixes #500