Added better parsing strategy