add support for all sqltype and reorganised packages