Port: Finish Store namespace