Make it compile =)
Remove useless typedefs
Refactoring of option class