Add sample handling for CSA 2014