TODO : add streaming feature, update branch alias