Adding canarys or something like that