Updated to change for unsupported features