Add more parsing and ready for generation