Polish more feature