Move main tags into base