Updated typescript definitions inline with r3