Replaced generic handlers into a separate package