reworking provider's query
reworking provider's insert
adding calling maps