Added proper address init