Updated common config according to new