refactoring - add the wrapper to all project