Changed the code a bit so that the entry route is also executed, not just passed over. This removes the need for the EntryRouteUnit class.