Added experimental security context support