Updated adressing and improved communication