Changes to the API (no more underscores in attribute names)