Add enclosure parseer
Add comments