Updated to features 2.0