Add ComponentPath support