Barcelona coach Xavi Hernandez is targeting the return of Lionel Messi and the signing of a defensive midfielder this summer.