Removed build from repo

Removed build from repo, made DatastoreComponent to be configurable
with multiple Datastore