Added toggle classes support