Enumeration

Pull request for enumeration.