Add few more modules and fix the amir.info file