Core class updated - Line deprecated