Added upsert and Id designation capabilities