Refactoring.
Definition should not define __construct().
Improve duplication management.