added service and context for other pieces