Complex primary key support
Doc update, some cosmetics