Add more parsing