Moved to extended classes for tables with declarative bases