Moved handler to new file.