Refactor adding org label