Moved subtype resolution to service.