Refactor: multi profile - rewritten logic