- Fixed and improved parser