Updated to Book and Instrument enums