Adding generic and configtable