Add refactor for embedded types prevent RC