Introducing Id class instead of dictionary