Updated for class assign