updated structure & configurations