More changes to help support Ironic plugin