Add more to parse function