Create a new branch to integrates IMA module #20