Finishing touches on generics support for syncing