Added getContext() to CommandController