Finished up refactoring of scope to work corectly with all options