Revamp advanced pydantic section