(#XXX) - Adds /_security support.