Removed dependency to yaml