Added support for gears