Simplified enormously thw class
Deleted the message interceptor import