Integrated more config options to accomodate near future updates