Change to match renamed Spiro.Models interfaces