Add address, fix prop names