Added support for key in component path