added additional config support