Improve specs
Support sample collection messages