Update after merge with data classes. Aux. package added.