added Context API + terminal direct calls