Added 2 more feature sets and corresponding functions