refractored Context object and dependent interfaces