Refactor comp map