Add robustness to type creation on service import