Completing remaining classes