Enhanced security and workflow efficiency

Enhanced security and workflow efficiency