Syntax updates

Hello Neil,

Some updates to reflect new libraries changes...