Fixing issue #174. Do refactor for container entity associated with route.