Refresh with latest sources; Added haswell CPU class