Housekeeping: Cleaned up extension hook (again ;)
Housekeeping: Removed unnecessary testing target
Refactored: Extracted extension points from lifecycle