Some major core changes