Factories enumeration support added, #1