Add upsert method on mapper to fix #49