Version 1.41 or higher - huge refactoring for using class instance