Many updates, mostly to storage of fpga sub-objects.