Addressed comments
Addressed comments: Added extra check on raw_profile registry and unchained the add to registry and add to raw profile registry.
I don't really like moving it into the add to registry method with the condition as that makes it more complicated.