Bump version
Refactor and integrate AbstractOptions