Added basic yaml parsing