Completed basic enumeration functionality