Added register class support.