Partial image support feature refactor