Self enumeration schema almost done