Finish data store and registration