tracing bug
change relational classes to generic for any key type
add back in sample data to v7 script