Changed Plugins Structure, Filter Added

Added Filter to avoid extra calls to the API (performance Improvements)