Updated with more support