Proposal of changes to respect backward comp