Changes after porting examples