Issue209 pump records

Merge pump records to development branch that works on the scaling of the performance to avoid conflicts in future development.