Modifications for new db