More work on Spiro Package