Added some angular features