Dev version with Angular integration