fixing medical device model and adding more properties to agree output