Refac tbl columns definitions