Refactor and update of the IAMaaS service