Basic support for provider specific images; Resolves #10
Fix conflict