Redefined plugin source API
Removed unnecesary code
Improved coverage, implemented API redefinition