Add common defines, move to large data