Images asstes architecture fix