Refactored options and added support for 0.9.