move component specifics into compoennt wrapper