FailSafe moved into a separated class