Added groundwork for spinner support.