Add plain Selector
Improve plugin template generation