First pass at discovery with attributes.