Adding incomplete class back in