Normalizing component services (#209)