Fixed and simplified parser