Updated with 2 missing mod handlers