Refactor Handler Specific Configuration