Placeholder refactor