Fixed Class loading for Manual injected classes