Added parsing
Update with all parent and child classes