Code refactoring and introduced options