@gkhachik let's start a discussion about it via email. I agree that it does become a bit cumbersome as we add new classes.