modify interfaces names and add dicsion in order to not send null messages