Add more feature, security check