moving invocation handler methods to invocation classes