Fixes #40
Simplified datastore manager