Fix to allow using 'options' as table name