Moved parsing into separate module.