Refactor linked profile map