Refactored Angular version