Direction refactoring, use Option is much more type save
Fix a wrong name of class