Simplified by removing support for line numbers