Added support for different instruments