Added more to User and Instrument implementation