Abtris/refactor poc