Adding configuratio support