WIP preparations for gisto-chrome plugin compatibility