Updated to latest core and store