Refactor tag building to be more easily extendable