Removed string parsing