Now supports yaml configuration files