Feature/474 generic angie

Close #474