Improved Consistency Throughout Classes