Refactoring to allow to easily remove presta cms