separate database work from master