Added address and description handling.