Klemen DB Changes

Klemen updated WaySegment and Database with improvments.