Removed the extra IDynamicClass and updated some core classes to use it correctly