Create separte handler file