* Introduced Option Inheritence
* Minor Refactoring / Cleanup