SimpleVariant changes and still debugging discovery after major overhaul of DB