Better integration of subpath in components list