Updates and refactors model analyzer