Ypaco 5 refactoring