Updated with supported features