Modified to conform to the refactoring of openfisca