Improve Migration parser