Change fetch logic