Renamed fields into properties and checked index and id types