Update requires and class definitions