Move handlers from util to handler