Added advanced yaml-to-sql support