Switch to new object syntax