Updated to use DBAL