Updated RegClass Coding