Move identity composition to handler.