load schema only when class was created
rm impl
Merge remote-tracking branch 'upstream/master'