Add multiltne support, Add test