Fixed imports in Options