Feature/generic table