Optimize fetch and store slightly