Make Plugin more extensible