Added yaml config support