Save and load now adds library images