Use yaml wrappers for retro-compatibility
Changed yaml find functions