Changed way the primary keys are handled. It is now possible to have a composite primary key

Changed way the primary keys are handled. It is now possible to have a composite primary key