Add class to compiler
Merge branch 'sonata/master'