Take into account more states for proxying closes #585
More UDT for #302