Better componentization.