added basic security support