Added supported check