Added asset and state parsing