Adding core changes