Add some pieces of code for non-magetab analysis