ItemSet + Item reimplemented. Pushing for Parser fix