added security - initial implementation