Added some better parsing