Made gift service initialization synchronous view more