Improved OA Context and added OA Frame