Added support to multi-partition images