Adding target handling.