added proper config support