Added support for unbound types
Service scope cleanup