20140415-0528-DWLT Added more security boiler plate work