Added hl7listener + modified study model