DB Setup and small BBEta change