Refactoring to class
Merge branch 'refactor/white-list'