Added selfChain property and removed the special case for chain state 1