Add support for system-images