Refactor labels and permissions