#75 Add container option for datastore configuration. Make datastore configuration inherited. Misc alignments.