Merged into plugin