Adopted to a new handlers schema.