Added Created/Updated state separation