Modifications for DB panel (more to come)