Added optional password protection