Added aggresive optimization for ForeignKeyFields