- Big refactor to solve BTC110