misc change
misc change
reduce code duplication of plugin
reduce code duplication for generate tasks
misc change