Added model for end points and update instrument/handler classes