Moved the setting of the target from the library to the client.