Feature/use angularitics