Refactored to work with simplified toml file