Began migration to component system