Options were been slightly refactored