Add Spinner support