Fixed DB Creation Script - R7