Fixed errors with integrating new component system.