More Component Refactor