Refactor project part : Add decorators