Update path for M1.2
Support more structure