Version 2.2 - Modifications for Primary and Foreign key

Resolved ticket #270