Switch to $brand, drop $type, add detection method. Deleted individual validation methods