Added support to composite foreign keys