* Removed ids, type fixing