Revamped DatabaseGenerator.