Update Image References and Type Considerations