Angular based improvements