Refactor profiles and placeholders