Removed djherbis/safe requirement