changed to use component-resolve-fields