Update core for clarity