updated to handle common config