refactor & readd Plugin demo again