Further syntax changes