Update table name
Define more map options

Fixes #46