Parser handmade changes