Multi stream support added, incomplete