Rework syntax