Changed methods name and fields name.
Added rout and line columns.
Merge remote-tracking branch 'origin/develop' into develop2