Refactored fetch method