Changed namespaces to be consistent.
Changed datastore implementation