Added configuration parser