Refactor and integrate AbstractOptions
Refactor services
Update version