[Closes #43] Added additional security