further work for migration system, added javadov