Updated some core components