#JC-1144:Fixed review remarks:
*Imports corrected
*More specific methods in PluginHandlerMapping