Updated features module to v2.0 branch