Refactored is yaml