Refactored to component specific setups