Add more feature functions