Adding sonata stuff