adopting to plugin environment