Improve moses analysis