Add basic support for instruments