added security feature with data contex and custom authorization