Updates to Address, Disk, Image, Operations + others