Changes for generic FKs