Refactoring. Correct ProfileStore