Updated lib/core