Manifest fixes.
metadata fixes.
Service class.