Added supported detection