Fix Core and Data