Moving to be InnoDB-specific