Refactor and add tag