implemented all changes related to non-static configration