Service library changes

Done.