rework of iam module