Some ddb enhancements