Added capability to handle spares