Add approval safe guards