Change to use handle instead of context parameter