simper model-->mapping and docs updates.