adds classSet and validation that was lacking