Added safety measures