Security enhacements 785