Split arrays properly
Make listed states behaviour contract