Add Road entity
Tweak [ci skip]