Move values into attributes to allow for overrides