Enzymatica refactor