Make adapters configurable in mapping files
Make primary keys non-mandatory