Add very basic support for labels and validators