Added subscription field and rfis might be broken