etl

b5b09274 - Added extra sanity checks for new classes