Json models now take in account block states