Added a bit more parsing