Added new direct image handling