Added support for other time signatures