Improve free-way plugin (thanks stickell for your comments!)