Added Tools selection