Adding support to configure base class on build
Merge branch 'base-object'