Structure revamped + added generic Instrument