Changed the after event for the "old" start / stop system
Added _base entities.