Handle call step
Change directive name
Handle manage step