Refactoring : Use binary resource Handler instead of image one