Added command filter and some fields to the enumeration we'll need