Refactoring to be code synchronous with chell-iam