Added cluster support for FK