Add instrument enum w/ custom instrument support