Support mapping of components as inner objects and not just nested