Added EOF matcher