Some protocol improvements, also different images support added