Added EOF enabled functions