Headers only refactor