Feature/instrument internals