Added Dmitry model and fix some XML files for optinal layers