Refactoring : use handle functions