Update database design, add state to items