Splitting the handlers (preparation for creating a separate "actual" handler)