handler signature refactor