Redesigned system to fully support images