Upgraded to the upstream eclasses