changes to Generic