Added initial support for spinners