Improve parser
Add config file