Add angular handling