Moved more necessities to core