Added samples, improved cardinality parsing.