Refactored services, build 0.9.14.119