Added guard on given name
Updated gems