Remove unused class_type attribute on Context
Add missing modules