Moved system to core