Modified attributes to be consistent with dashed syntax
Updated compatibility with 1.2.0-rc3