Inherit from proper base class
Added m3 options