Adding generic configuration support