Fix Extension class