Replace old class creator
Merge remote-tracking branch 'origin/master'