Topic/make eco benefits pluggable