Yes. If this is not acceptable, I can fix it within this PR in the most simple way (spliting the class into 2 classes) and in a next PR we can deal with the hierarchy/abstract class/interface.