Feature/bokeh integration