Add spinner support