Feature/serviced integration

Core changes to integrate with serviced.