Added full support for research bench